python3Packages.llama-cpp-python: 0.3.6 -> 0.3.8#391734
Merged
Conversation
github-actions
bot
added
6.topic: python
Contributor
|
booxter
suggested changes
Mar 21, 2025
Contributor
There was a problem hiding this comment.
Do we have to have an empty list for patches here?
Contributor
There was a problem hiding this comment.
Instead of this, consider defining the variable that circumvents git revision extraction:
diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 115c533479f7..b7868efdcec0 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -8,7 +8,6 @@
# nativeBuildInputs
cmake,
- git,
ninja,
# build-system
@@ -65,7 +64,7 @@ buildPythonPackage rec {
# -mcpu, breaking linux build as follows:
#
# cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’
- [ "-DGGML_NATIVE=off" ]
+ [ "-DGGML_NATIVE=off" "-DGGML_BUILD_NUMBER=1" ]
++ lib.optionals cudaSupport [
"-DGGML_CUDA=on"
"-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}"
@@ -78,7 +77,6 @@ buildPythonPackage rec {
nativeBuildInputs = [
cmake
ninja
- git
];
build-system = [
The final cmake version file suggests that the build system fails to extract the revision from git anyway, since we don't checkout submodules deeply. See:
$ grep PACKAGE_VERSION result/lib/python3.12/site-packages/lib/cmake/ggml/ggml-version.cmake | grep '^set'
set(PACKAGE_VERSION "0.0.")
If you think we should have the version populated properly, then we should do:
diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 115c533479f7..03f136e8f0e7 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -48,8 +48,9 @@ buildPythonPackage rec {
owner = "abetlen";
repo = "llama-cpp-python";
tag = "v${version}";
- hash = "sha256-F1E1c2S1iIL3HX/Sot/uIIrOWvfPU1dCrHx14A1Jn9E=";
+ hash = "sha256-KLlm0rHOqEB90XXxJj+tunO6Nxyy/WUoTbhnkfmalAw=";
fetchSubmodules = true;
+ deepClone = true;
};
# src = /home/gaetan/llama-cpp-python;
With that, the version is correctly populated:
$ grep PACKAGE_VERSION result/lib/python3.12/site-packages/lib/cmake/ggml/ggml-version.cmake | grep '^set'
set(PACKAGE_VERSION "0.0.4875")
kirillrdy
force-pushed
the
llama-cpp-python
branch
from
b381e78 to
c518609
Compare
booxter
suggested changes
Mar 21, 2025
Contributor
There was a problem hiding this comment.
If you deepClone then the version will actually be extracted from the (submodule) git revision; and then you don't need to override it with the variable here. These two are mutually exclusive.
kirillrdy
force-pushed
the
llama-cpp-python
branch
2 times, most recently
from
1432495 to
1507a8d
Compare
Contributor
|
wegank
added
12.approved-by: package-maintainer
booxter
suggested changes
Mar 21, 2025
Contributor
booxter
left a comment
booxter
left a comment
There was a problem hiding this comment.
I tried to run the same on a different machine and I'm afraid that deepClone won't work because there's a bug in its implementation that makes it not deterministic: #100498 :(
We will probably have to go with overriding the variable until this is fixed in the fetcher.
kirillrdy
force-pushed
the
llama-cpp-python
branch
from
1507a8d to
7e69ba3
Compare
booxter
approved these changes
Mar 21, 2025
Contributor
|
When abetlen/llama-cpp-python#1979 is fixed, we may be able to remove the fake version setting and rely on the version file included in the package tarball. |
booxter
added a commit
to booxter/nixpkgs
that referenced
this pull request
Aug 23, 2025
It was dropped in: NixOS#391734 But upstream regressed so we have to patch it again.
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
diff: abetlen/llama-cpp-python@v0.3.6...v0.3.8
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.